projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
db5b339
)
kbuild: tools: fix a bug that always builds Denx logo
author
Masahiro Yamada
<
[email protected]
>
Mon, 3 Mar 2014 09:40:56 +0000
(18:40 +0900)
committer
Tom Rini
<
[email protected]
>
Tue, 4 Mar 2014 17:15:31 +0000
(12:15 -0500)
LOGO_BMP was never overwritten by board-specific or
vendor-specific logos.
Signed-off-by: Masahiro Yamada <
[email protected]
>
Reported-by: Bo Shen <
[email protected]
>
Tested-by: Bo Shen <
[email protected]
>
tools/Makefile
patch
|
blob
|
history
diff --git
a/tools/Makefile
b/tools/Makefile
index 8fccc650cc490efa49b0632ed193845a4a18cc33..bac6aafc80b3019fc840ee12235a0be700fe2616 100644
(file)
--- a/
tools/Makefile
+++ b/
tools/Makefile
@@
-157,10
+157,10
@@
ifeq ($(LOGO_BMP),)
LOGO_BMP= $(srctree)/$(src)/logos/denx.bmp
# Use board logo and fallback to vendor
-ifneq ($(wildcard logos/$(BOARD).bmp),)
+ifneq ($(wildcard
$(srctree)/$(src)/
logos/$(BOARD).bmp),)
LOGO_BMP= $(srctree)/$(src)/logos/$(BOARD).bmp
else
-ifneq ($(wildcard logos/$(VENDOR).bmp),)
+ifneq ($(wildcard
$(srctree)/$(src)/
logos/$(VENDOR).bmp),)
LOGO_BMP= $(srctree)/$(src)/logos/$(VENDOR).bmp
endif
endif